Add 16x16 versions of the zoom icons and of GTK_STOCK_INDEX. Some of the

	Add 16x16 versions of the zoom icons and of
	GTK_STOCK_INDEX. Some of the images were taken from
	the hicolor icon theme, and were originally created
	by Jakub Steiner and Tuomas Kuosmanen. 	(#167515,
	Vincent Noel)

	* gtk/stock-icons/stock_index_16.png:
	* gtk/stock-icons/stock_zoom_1_16.png:
	* gtk/stock-icons/stock_zoom_fit_16.png:
	* gtk/stock-icons/stock_zoom_in_16.png:
	* gtk/stock-icons/stock_zoom_out_16.png: New images.

	* gtk/stock-icons/Makefile.am: Add the new images.

diff --git a/ChangeLog b/ChangeLog
index 0964388419ade43a8afe1a9e8ebe7cab00df78c2..c2d63b70e3b566dae4b59f3daa86c6de978e0e4e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,19 @@
 2005-04-09  Matthias Clasen  <mclasen@redhat.com>
 
+       Add 16x16 versions of the zoom icons and of 
+       GTK_STOCK_INDEX. Some of the images were taken from 
+       the hicolor icon theme, and were originally created 
+       by Jakub Steiner and Tuomas Kuosmanen.  (#167515, 
+       Vincent Noel)
+       
+       * gtk/stock-icons/stock_index_16.png:
+       * gtk/stock-icons/stock_zoom_1_16.png:
+       * gtk/stock-icons/stock_zoom_fit_16.png:
+       * gtk/stock-icons/stock_zoom_in_16.png:
+       * gtk/stock-icons/stock_zoom_out_16.png: New images.
+       
+       * gtk/stock-icons/Makefile.am: Add the new images. 
+
        * gtk/gtkimage.c (gtk_image_calc_size, gtk_image_expose): 
        Don't display too many broken images.  (#169870, Roman
        Kagan, patch by Ivan Wong)

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 0964388419ade43a8afe1a9e8ebe7cab00df78c2..c2d63b70e3b566dae4b59f3daa86c6de978e0e4e 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,19 @@
 2005-04-09  Matthias Clasen  <mclasen@redhat.com>
 
+       Add 16x16 versions of the zoom icons and of 
+       GTK_STOCK_INDEX. Some of the images were taken from 
+       the hicolor icon theme, and were originally created 
+       by Jakub Steiner and Tuomas Kuosmanen.  (#167515, 
+       Vincent Noel)
+       
+       * gtk/stock-icons/stock_index_16.png:
+       * gtk/stock-icons/stock_zoom_1_16.png:
+       * gtk/stock-icons/stock_zoom_fit_16.png:
+       * gtk/stock-icons/stock_zoom_in_16.png:
+       * gtk/stock-icons/stock_zoom_out_16.png: New images.
+       
+       * gtk/stock-icons/Makefile.am: Add the new images. 
+
        * gtk/gtkimage.c (gtk_image_calc_size, gtk_image_expose): 
        Don't display too many broken images.  (#169870, Roman
        Kagan, patch by Ivan Wong)

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 0964388419ade43a8afe1a9e8ebe7cab00df78c2..c2d63b70e3b566dae4b59f3daa86c6de978e0e4e 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,5 +1,19 @@
 2005-04-09  Matthias Clasen  <mclasen@redhat.com>
 
+       Add 16x16 versions of the zoom icons and of 
+       GTK_STOCK_INDEX. Some of the images were taken from 
+       the hicolor icon theme, and were originally created 
+       by Jakub Steiner and Tuomas Kuosmanen.  (#167515, 
+       Vincent Noel)
+       
+       * gtk/stock-icons/stock_index_16.png:
+       * gtk/stock-icons/stock_zoom_1_16.png:
+       * gtk/stock-icons/stock_zoom_fit_16.png:
+       * gtk/stock-icons/stock_zoom_in_16.png:
+       * gtk/stock-icons/stock_zoom_out_16.png: New images.
+       
+       * gtk/stock-icons/Makefile.am: Add the new images. 
+
        * gtk/gtkimage.c (gtk_image_calc_size, gtk_image_expose): 
        Don't display too many broken images.  (#169870, Roman
        Kagan, patch by Ivan Wong)

diff --git a/gtk/gtkiconfactory.c b/gtk/gtkiconfactory.c
index 5706320611be7359e94c0a20ed7ffe8db2544225..30f2a373e99e8ef6b086cf1d95240c6b2c827532 100644 (file)
--- a/gtk/gtkiconfactory.c
+++ b/gtk/gtkiconfactory.c
@@ -760,16 +760,31 @@ get_default_icons (GtkIconFactory *factory)
             16, stock_media_stop_16,
             24, stock_media_stop_24);
 
+  add_icon2 (factory, GTK_STOCK_INDEX, 
+            16, stock_index_16,
+            24, stock_index_24);
+
+  add_icon2 (factory, GTK_STOCK_ZOOM_100, 
+            16, stock_zoom_1_16,
+            24, stock_zoom_1_24);
+
+  add_icon2 (factory, GTK_STOCK_ZOOM_IN, 
+            16, stock_zoom_in_16,
+            24, stock_zoom_in_24);
+
+  add_icon2 (factory, GTK_STOCK_ZOOM_OUT, 
+            16, stock_zoom_out_16,
+            24, stock_zoom_out_24);
+
+  add_icon2 (factory, GTK_STOCK_ZOOM_FIT, 
+            16, stock_zoom_fit_16,
+            24, stock_zoom_fit_24);
+
   /* Generic size only */
 
   add_icon (factory, GTK_STOCK_CLEAR, 24, stock_clear_24);
   add_icon (factory, GTK_STOCK_SELECT_COLOR, 24, stock_colorselector_24);
   add_icon (factory, GTK_STOCK_COLOR_PICKER, 25, stock_color_picker_25);
-  add_icon (factory, GTK_STOCK_INDEX, 24, stock_index_24);
-  add_icon (factory, GTK_STOCK_ZOOM_100, 24, stock_zoom_1_24);
-  add_icon (factory, GTK_STOCK_ZOOM_FIT, 24, stock_zoom_fit_24);
-  add_icon (factory, GTK_STOCK_ZOOM_IN, 24, stock_zoom_in_24);
-  add_icon (factory, GTK_STOCK_ZOOM_OUT, 24, stock_zoom_out_24);
 }
 
 /************************************************************

diff --git a/gtk/stock-icons/Makefile.am b/gtk/stock-icons/Makefile.am
index 9963b6236377b87ecbca7ad427d7e90eb57b97d4..6086415e5e5db92b8de71400701dc6489bce665e 100644 (file)
--- a/gtk/stock-icons/Makefile.am
+++ b/gtk/stock-icons/Makefile.am
@@ -63,6 +63,7 @@ IMAGES = \
        stock_help_24.png               \
        stock_home_16.png               \
        stock_home_24.png               \
+       stock_index_16.png              \
        stock_index_24.png              \
        stock_jump_to_16.png            \
        stock_jump_to_24.png            \
@@ -165,9 +166,13 @@ IMAGES = \
        stock_up_arrow_16.png           \
        stock_up_arrow_24.png           \
        stock_yes_20.png                \
+       stock_zoom_1_16.png             \
        stock_zoom_1_24.png             \
+       stock_zoom_fit_16.png           \
        stock_zoom_fit_24.png           \
+       stock_zoom_in_16.png            \
        stock_zoom_in_24.png            \
+       stock_zoom_out_16.png           \
        stock_zoom_out_24.png
 
 VARIABLES1 = \
@@ -235,6 +240,7 @@ VARIABLES3 = \
        stock_harddisk_24               $(srcdir)/stock_harddisk_24.png \
        stock_home_16           $(srcdir)/stock_home_16.png             \
        stock_home_24           $(srcdir)/stock_home_24.png             \
+       stock_index_16          $(srcdir)/stock_index_16.png            \
        stock_index_24          $(srcdir)/stock_index_24.png            \
        stock_jump_to_16        $(srcdir)/stock_jump_to_16.png          \
        stock_jump_to_24        $(srcdir)/stock_jump_to_24.png          \
@@ -342,9 +348,13 @@ VARIABLES6 = \
        stock_up_arrow_16       $(srcdir)/stock_up_arrow_16.png         \
        stock_up_arrow_24       $(srcdir)/stock_up_arrow_24.png         \
        stock_yes_20            $(srcdir)/stock_yes_20.png              \
+       stock_zoom_1_16         $(srcdir)/stock_zoom_1_16.png           \
        stock_zoom_1_24         $(srcdir)/stock_zoom_1_24.png           \
+       stock_zoom_fit_16       $(srcdir)/stock_zoom_fit_16.png         \
        stock_zoom_fit_24       $(srcdir)/stock_zoom_fit_24.png         \
+       stock_zoom_in_16        $(srcdir)/stock_zoom_in_16.png          \
        stock_zoom_in_24        $(srcdir)/stock_zoom_in_24.png          \
+       stock_zoom_out_16       $(srcdir)/stock_zoom_out_16.png         \
        stock_zoom_out_24       $(srcdir)/stock_zoom_out_24.png
 
 noinst_DATA = gtkstockpixbufs.h